Revert "gdkwindow-x11: Don't set WM_TAKE_FOCUS if accept_focus is FALSE"

This reverts commit 809aab2c8ec88c7b10254a948ba8754a766b1f7c.

diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index a8e92b6bec8ad55e6ca3a7ea363577073bb76021..5b51db33132dd7b3559e925af555cb901dadced3 100644 (file)
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -772,11 +772,9 @@ set_wm_protocols (GdkWindow *window)
   int n = 0;
   
   protocols[n++] = gdk_x11_get_xatom_by_name_for_display (display, "WM_DELETE_WINDOW");
+  protocols[n++] = gdk_x11_get_xatom_by_name_for_display (display, "WM_TAKE_FOCUS");
   protocols[n++] = gdk_x11_get_xatom_by_name_for_display (display, "_NET_WM_PING");
 
-  if (window->accept_focus)
-    protocols[n++] = gdk_x11_get_xatom_by_name_for_display (display, "WM_TAKE_FOCUS");
-
 #ifdef HAVE_XSYNC
   if (GDK_X11_DISPLAY (display)->use_sync)
     protocols[n++] = gdk_x11_get_xatom_by_name_for_display (display, "_NET_WM_SYNC_REQUEST");
@@ -3493,10 +3491,7 @@ gdk_x11_window_set_accept_focus (GdkWindow *window,
 
       if (!GDK_WINDOW_DESTROYED (window) &&
          WINDOW_IS_TOPLEVEL_OR_FOREIGN (window))
-        {
-          update_wm_hints (window, FALSE);
-          set_wm_protocols (window);
-        }
+       update_wm_hints (window, FALSE);
     }
 }